Restructure source tree for easier building