added all jsp files and finished groups