Change directory structure and add module xml activation