Fixes and changes to the overall structure
UI part is done
Using sites-* structure now