Changed to module structure and fixed templates