Changed comment titles in common.make & updated anna to new strucure.