Manager cleanup and add annotations for spring for shiftManager
Moving servlets to controllers