cleaned api package...removed some old stuff
fixed last bugs regarding import switch