changed folder structure / namespaces to avoid conflicts