Created and sorted some classes and methods
Some changes