Added some structure to install