Working structure in place
Removed unused files