Adding markup and removing extraneous files