changed package structure, added server console
Revert "changed package structure, added server console"

This reverts commit 1a564beccbb95aeabb4b81f9fc96dd0afac5fc1b.
changed package structure, added server console