fixing some imports after file name changes
Final refactor tweaks, plus make homepage show latest price