add test. remove unused folders.