reworked files in solution