Module importing refactoring
Added .directory
Merge
Changed port