Removed package annotations and some coding style
Some cs fixes.

* Also added method "POST" in some router definitions