Pull back restructuring and add version to info