ticket:1 Modify structur of project; modify unit test