Added two new amino acids and changed package structure