fixed namespaces
Mavienized directory structure