Restruced skeleton to test namespace