Update markup and package structure