Handling None values. Defined package structure

    Dirty code. Needs cleanup in next commit