Changed folder structure to make it easier to understand.