Removing extra folder from structure
Fixed missed stub stuff for SampleAPI