General tidy up, removed files no longer used and moved others to misc location