Cleaned up
Changed path to base.php
More cleaning
Added Classes for data preparation