Revert "First Upload"

This reverts commit bb2ef9fe21f5c3b22857d178714b55545f8fc2b0.
Refactor