Moved methods and classes

Now more organized