1.7 Preperations

- Clean Out Code
- Organisation
- Misc Changes
- Tweaks