reorganized files structure, added solution