remove ros and common subfolder structure