moving and renaming
cleaning up
changing include paths