restructured directories and files