Remove sandbox and restructure api contents