Reorganized includes, added vector datatype