Updated to version 2
Fixed some issues with file names and imports