Added app and test directories