Revert "Initial commit"

This reverts commit a11af886130f80c127e83b3bd0cba264553ac51f.
Refactoring