Restructured and started on new version css