Minor Project Structure Refactoring & Assets