A bit more restructing and furthered installation process