Updated .gitignore
Updated makefiles
Decouopled integration into its own class.