Tweak Structure

restructure