Move code to __init_- now we have a directory