Add some dev checks and rename some files