Restructure files & classes

Currently the files & classes we have are vague and not properly named. We should break these up in smaller classes and make things easier.