Initial restructuring work
Composer and gitignore updated
Cleanup