Reorganize file stucture.