Moved assets to res/raw, cleaned code