Cleaned Solution, fixed namespaces bugs