Remove temp class and rename "common" bundle to "base".