minor structure changes
remove a few more excess files