OOP UPDATE

Classes updated and structure to function like OOP PHP.