Add proper folder structure