Validation

Validation code isn't complete but I've been making changes to directory structure that I want in master.