Removed unused exports
Follow package pattern
Added file descriptions