Moved to 15.01 model
- cleaned up file names
- moved to OOP