Revert "Restructure of repo"

This reverts commit 45d2a423e2557af0b6b4dc68b54bb091160b7ebc.