Bug 1070001: Re-org Stylus - Profile

Re-org all the things.