Rearranged folder structure.
General tidy-up.