Multiple file structure still has bugs--reverting back for now