Merge pull request from hello-nyxo/refactoring/sleep-calendar Refactoring aliases and paths