rearranged project, solving issue enhancement #2