Restructured to contain the whole ros package