Reorganized files
Merged kyle into master