Moved java files to controller package