moving to cleaner setup for file layouts.

yup.