restructured directories, packages