Commit 007: Updated file structure