Updated files structure. Implemented test.