Moved source to be compatable with Gradle's default layout