simplify source directory structure