Reorganize directories and add space for part 2