rearranged file structure to mirror java project