Rearranged directory for java project