Major overhaul of directory structure, putting things that belong tegother in seperate folders.