Added EffectBlock class and re-structured files