Rearrange the folder structure. Remove Java stuff