Bug fixes and Folder movements

Moved the folder structure around so that it all makes sense on a new
installation, edited main app to fix a couple of errors that I found on
re-reading the code, deleted some old scripts that are surplus to
requirements.