Moved assets into main directory, changed references