Cleaned up API package
Merge branch 'origin/master'