Moved classes to respective folders