GH-419 Moved around files for Maven to properly find them