close #26 - organize project