Reorganize to allow for Java projects.