reorganized files because of eclipse structure