restructure directories and files