Moved files for consistency with gradle build system (in another pull request)