renamed project and moved packages around