Moved request handlers to other package