tidy up the code base, moved/removed files not used