renamed repo, cleaned structure, testing capable