Updated directory package structure