Cleaned up builder and added package