Updated structure to Maven