Tidied up file structure, removed unneeded files