reorganization and fix filename grammar