Add classes and index.php
Some changes
Merge branch 'oop' into develop