Changing the filesystem structure to be more java-standard