Directory structure changed to facilitate merge