added default properties, renamed and refactored files according to new properties