Add the files in their rough state
Massive reorganization