Add folders and tests