Moved everything to the corresponding files, me was derping