Re-organize folders for class