Created classes and inserted existing code