File organization fixes