Changed packaging format, added more commenting