removed an include
moved some files around
fixed an input bug
Merge branch 'development'