> some UI controls added
> improved directory structure
resolved the coflicts