organize file structure, deleted cruft