moved to a directory structure, included controller