updated file structure to match requirements.