Add Core module
Implement lif importing
Merge branch 'develop'