Final changes for the first working version
Change where stuff installed