reorganizing file strucure