Reordered folders and fixed namespaces.