Updated directory structure