More work on populating the amp directory