Moved asset file location and cleaned up