Massive reorganization and additional files updated