Big Restructure

Probably broke everything. ;)