reorganized files and dependencies