changed directory package structure