Various changes

* Added fileinstall
* Refactored extras into extras folder
Restructure