Refactored structure of files and folders to be more natural and user friendly.