Fixed file structure

The old way sucked, this way is much more organized!