Work In Progress

- Removed older files
- Updated the layout