Refactor Folder structure
ADD:DotSettings