Restructured project back to the older structure.

Signed-off-by: Panajev <Panajev@gmail.com>