new files added and more organized