Massive rename
Removed junk and refactored everything ^^