Removed unused files and renamed remaining files to be more sensible - cleaned up since I am restarting development!