Change directory layout for User apps, bug fixed and Add samples

[General]
*Directory layout was changed
*Bug fix
*Add samples