Reorganized folder structure to make testing easier.