some reorganized files and small changes