Reorganization and fixed errors (again)