Move core files to their own dir
Fix typo