Add maven and change directory structure