[CLEANUP] Reorganizing Maven structure to work with release plugin