restructure directory/files