Simplified directory structure and misc updates.
Remove space.
Update feature header.