restructured directories and packages