Organized DevService

And fixed some errors.