Moving parts into directories