Revised Agent directory structure