Major refactoring. Added create and serve commands