Moved assets to res/raw, clean code