Move shared classes to a folder