Restructure to catkinize the repo from root