Change directory structure to adhere to Maven standard