REFACTORING: removed ...~ files and renamed our files so their names
upper case