Refactoring move properties files to properties folder