Refactored file structure according to the new theme.