reorganzing file structure