Cleanup

- .html to .php
- reorganization
- altering variables to fit modified database