1. Folder names chanched
2. Some new commenta added to source code