Post layout
Moved checks to data dir