Improved organization of src/ tree.