Moved arround some assets + updated code