Move some files areound
Apply latest changes from pete
Adopt to latest changes