added source files and refactored format listing with them