Updated directory structure and organization