Split different classes into indivudal class files
Fixed Duplication error
Fixed picture loading