first commit
Version 1 complete
Cleanup - structure and filenames