Add empty directories and remove test files