development: Updated directory structure