Made src directory structure more sane - all binaries are now built in src but sources are divided amongst subdirs of src