re-organized structure, bumped rev