Reorder Project setup, fix maven warnings