Changed folder structure to add testing folder.