changed package structure, added server console