Restructured, fixed issues