Flattened the source directory structure a bit for convenience.