diff --git a/commandOrEventType.go b/command_event_type.go
similarity index 100%
rename from commandOrEventType.go
rename to command_event_type.go
diff --git a/configurationAndFlags.go b/configuration_flags.go
similarity index 100%
rename from configurationAndFlags.go
rename to configuration_flags.go
diff --git a/message-and-subject.go b/message_and_subject.go
similarity index 100%
rename from message-and-subject.go
rename to message_and_subject.go
diff --git a/publisher-services.go b/publisher-services.go
deleted file mode 100644
index 4ea16e2..0000000
--- a/publisher-services.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package steward
-
-// // REMOVED:
-// type publisherServices struct {
-// 	sayHelloPublisher sayHelloPublisher
-// }
-//
-// func newPublisherServices(sayHelloInterval int) *publisherServices {
-// 	ps := publisherServices{
-// 		sayHelloPublisher: sayHelloPublisher{
-// 			interval: sayHelloInterval,
-// 		},
-// 	}
-// 	return &ps
-// }
-//
-// // ---
-//
-// type sayHelloPublisher struct {
-// 	interval int
-// }
-//
-// func (s *sayHelloPublisher) start(newMessagesCh chan<- []subjectAndMessage, fromNode node) {
-// 	go func() {
-// 		for {
-// 			sam := s.createMsg(fromNode)
-// 			newMessagesCh <- []subjectAndMessage{sam}
-// 			time.Sleep(time.Second * time.Duration(s.interval))
-// 		}
-// 	}()
-// }
-//
-// // Will prepare a subject and message with the content
-// // of the error
-// func (s *sayHelloPublisher) createMsg(FromNode node) subjectAndMessage {
-// 	// TESTING: Creating an error message to send to errorCentral
-// 	m := fmt.Sprintf("Hello from %v\n", FromNode)
-//
-// 	sam := subjectAndMessage{
-// 		Subject: Subject{
-// 			ToNode:         "central",
-// 			CommandOrEvent: EventNACK,
-// 			Method:         SayHello,
-// 		},
-// 		Message: Message{
-// 			ToNode:   "central",
-// 			FromNode: FromNode,
-// 			Data:     []string{m},
-// 			Method:   SayHello,
-// 		},
-// 	}
-//
-// 	return sam
-// }
-//
diff --git a/getmessagefromfile.go b/read_socket.go
similarity index 100%
rename from getmessagefromfile.go
rename to read_socket.go
diff --git a/runProcessesAtStartup.go b/startup_processes.go
similarity index 100%
rename from runProcessesAtStartup.go
rename to startup_processes.go
diff --git a/subscriber-services.go b/subscriber-services.go
deleted file mode 100644
index 85cf2a2..0000000
--- a/subscriber-services.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package steward
-
-// // subscriberServices will hold all the helper services needed for
-// // the different subcribers. Example of a help service can be a log
-// // subscriber needs a way to write logs locally or send them to some
-// // other central logging system.
-// type subscriberServices struct {
-// 	// sayHelloNodes are the register where the register where nodes
-// 	// who have sent an sayHello are stored. Since the sayHello
-// 	// subscriber is a handler that will be just be called when a
-// 	// hello message is received we need to store the metrics somewhere
-// 	// else, that is why we store it here....at least for now.
-// 	sayHelloNodes map[node]struct{}
-// }
-//
-// //newSubscriberServices will prepare and return a *subscriberServices
-// func newSubscriberServices() *subscriberServices {
-// 	s := subscriberServices{
-// 		sayHelloNodes: make(map[node]struct{}),
-// 	}
-//
-// 	return &s
-// }
-//
-// // ---
-//
diff --git a/subscriberMethodTypes.go b/subscriber_method_types.go
similarity index 100%
rename from subscriberMethodTypes.go
rename to subscriber_method_types.go
diff --git a/textlogging.go b/textlogging.go
deleted file mode 100644
index 5fd4681..0000000
--- a/textlogging.go
+++ /dev/null
@@ -1 +0,0 @@
-package steward