Added new functions to conversion class
renamed core files
Updated renamed files