directory structure changes and some spec templates