Rename files
Make constructor functions in the prevailing style