move everything under /

no need for loads of different paths
tidy of warnings and remove a couple of debug parameters