Splitting serve into separate module, hlint tidy