first step of a cleanup
continuing cleanup
finalizing a bit of cleanup
should be the last of the cleanup for this bit, simplifying the directory paths of the framework
whoops, missed one detail, should be good now