- Renamed files
- Cleaned up.