Moved views around to respective view folders