Alex's edits

- Added form
- Cleaned up folder structure