Changed __init__ file and some function imports for proper importing of modules