Moved Komitter inside packages