Moved classes to directories matching namespace