Add folders and test