Ensured it followed src/main/java, and src/test/java conventions