Revert "REturning to catkin structure"

This reverts commit b1b299a55b7fcd2ab6e0eb970232d7d1b51e8de9.