moved files to keep java project structure and updated imports