Moved tests to catalogs
Set dirs hierarchy