moved obsolete and changed file naming