Refactored Register classes out of main source file