restructure java project