Updates to structure and models
Cleaning up repo