Changed folder structure to have less clutter.