organize a little and remove misc file