rearange file structure