reorganized files, made root dir smaller