Revert "refactory"

This reverts commit b047e8cb8ac0b9eb1eb7782f5eed15f5fd98a7fe.
Revert "refactoring"

This reverts commit cf8b57b475e18ba52229dd6aaf81393195e8bfd8.
Revert "refactorying"

This reverts commit 3a679f1f9fef98f3ac21e094c0797de2b4674daa.
Revert "well, that's not going as easily as it might... time for the REFACTORINATOR"

This reverts commit a6d2d4a9cef0ca500e6c1da28739ca3efcfda67b.
Revert "s3 working at all"

This reverts commit 7af0837efd9d4a12225ffa9e12295085eed149a2.
Revert "adding support for s3 at all"

This reverts commit 5329896a2db339916c12ed46aa725faa5d6a6f3f.