improved server side structure

- added production support