directory re-organized, dynamic loading added
Merge branch 'learning/web'