Rearrange codes/imports and Categorize classes