Update all the things. Maven and Reformatting folder hierarchy