Refactor src/ structure and namespaces for organization