Tidy up

getting rid of files and re-structuring dev environment