Rearranged some files in features