Restructure without -build packages