Improved files/folder structure.