Stops to shapes mapping

Including schema refactoring