Testing

Cleaned the scripts to have a MVC structure.