[ADD] New style; remove unneeded files