Class organization almost finished
Commit because I Must do >.>