Updated directory paths to reflect new package structure