Updated to match current Swift Compiler / HttpServerHandler extracted / Refactoring