Moved some source files to the Gradle style source structure