new directory structure
fixing CI build