puzzle solved, added module structure