change: simplify file structure, create: unittests