Imported more necessary files
Changes to make it work as a module