Server classes

PR before implementing Transformer, this branches was late behind some commits