Move classes to proper directories for eclipse