tables moved to schema, added infrastructures table