Refactored Approach

Need to build new feature structure from loose browser files.