Restructuring and new server test

Failure on purpose to make sure travis marks it as an invalid build.