Restructure, preparing for proper upload