Add more dirs and cleanup stuff