Ready for delivery

Reorganization of the files