Move convert code into convert directory