Feature/move old stuff to another category