refactored and combined jii-api and jii-web into a single server