I8: Improving the Project Structure