Documentation and simplification
Some modeling
Changing folder structure
Some more modelling
File clean up