Moving Normal implementation to Normal folder.