Big refactor. I dont know what i have done! (too much changes)
Cleaning catalog.