Adding core sub-folder and including normalizer. Need to come back and clean up normalize code.