Moved classes to own subfolder