Merge pull request #78 from ADmad/master

Change "APP" to "src" in path to avoid confusion.