Fix cp errors + modules locations