Misc. file location updates
Misc. file location updates, included files missed in prev commit
Added file upload field but have not yet implemented file upload to server, minor file system restructure