Merging URI and upload into single form
Reorganizing templates

TODO
Fix jQuery uploads, validation
Test on productio