Split Inital Code into seperate classes