Moved and renamed CodeConvention to CodeFileConvention
Moved NamingConvention to the root