reorganization of framework, detailed in README