A little housecleaning...

moved some files and directories around, changed some names...