Cleaned up casing for naming & extensions, & set a naming convention