Extracting MasterServerFactory to it's own file
Renaming master server to handler