Implemented 'Move To Tomorrow' and Code refactoring