Old structure cleanup

Cleaned old directories.
Removed unused api.