update directory structure, add initial stage of amd/modular support