Shared classes moved to separate folder