Re-ordered things inside the pom to remove dependecy issues