Refactored to match PLP-Browser pattern

made a lot of changes, refactoring, deleting and cleanup