Refactoring... lalala!

I think this big refactor is going to make the whole structure much more organized!