Restructur class directory and the classes