Project refactor aswell as namespaces