FIX: Project Structure and Refactoring