Moved resource files and refactored references
Removed eye-burning whitespace