Better split of files, added first tests