Revert "Changed file organization"

This reverts commit 8d2d5ba2ca7675e87b3e03b8f2e16a39423ebd6f.