Directories now adopt proper package structure