Organizing __init__ script again