improve __init__ file
change package structure