Add tests, sort stuff, prepare folders, separate classes