Fixed url rewriting and added modules