little changes to hierarchy and layout/server.py