Updates

Made some updates to the file-structure and deleted some old files.