Directories moved
Improved activities lifecycle