Cleaned up package layout & fixed text api tests