Cleaned old directories.
Removed unused api.
Merge remote-tracking branch 'ozan/old-structure-cleanup'