Path changes and some renaming
Added some widgets