Moved files overhaul change