Moved models into folders

Moved models into folders by category; fixed bugs with timestamp
functions