Moved classes to real folders