reorganized files and redefined includes