Renamed Namespaces to follow folder structure.
Reformatted code to follow StyleCop rules.