Added directory package structure