Corrected import hierarchy, decomposed several classes