Change in application structure + various Bug Fix and improvement