moving loader code to better location
renaming loader