Changed structure of files, added pytest option to makefile