Organization

Refactored some stuff, deleted some things