Moved cord into separate packages
Updated todos