Reworked folder structure.