reorganization and stuff
fix definitive version