Moved models into it's own folder
All members are now prefixed with underscore