Structure updates and a lot more templated lib files to be filled in