file structure reorganization