diff --git a/FSm/Token.h b/FSm/Token.h
new file mode 100644
index 0000000..3bc523c
--- /dev/null
+++ b/FSm/Token.h
@@ -0,0 +1,392 @@
+#ifndef FSm_Token_h
+#define FSm_Token_h
+
+#include "header.h"
+
+static TokenT LeerToken( FILE *stream, char *term ) {
+    
+    int next_ch;  
+    int state;    
+    int i;        
+    int p;
+    
+    state = 0;
+    i = 0;
+    p = 0;
+    
+    while ( 0  <= state ){
+        if ( EOF == (next_ch = getc(stream)) ) {
+            next_ch = '\0';
+        }
+        
+        term[i++] = convert_case[next_ch];
+        
+        switch ( state ){
+            case 0 :
+                switch ( char_class[next_ch] ) {
+                    case WHITE_CH :     
+                        i = 0; 
+                        break;
+                        
+                    case LETTER_CH :    
+                        state =  1; 
+                        break;
+                        
+                    case LFT_PAREN_CH :
+                    case RGT_PAREN_CH :
+                    case LFT_CURLYBRACKET_CH :
+                    case RGT_CURLYBRACKET_CH : 
+                    case LFT_SQRBRACKET_CH : 
+                    case RGT_SQRBRACKET_CH : 
+                        term[i] = '\0'; 
+                        state = -AGRUPATION_TOKEN; 
+                        break;
+                        
+                    case AMPERSAND_CH : 
+                        state = 4; 
+                        break;
+                        
+                    case PIPE_CH :       
+                        state = 5; 
+                        break;
+                        
+                    case CARET_CH :     
+                        state = 6; 
+                        break;
+                        
+                    case EOS_CH :       
+                        state = -7; 
+                        break;
+                        
+                    case DIGIT_CH :     
+                        state = 25; 
+                        break;
+                        
+                    case OTHER_CH :   
+                        term[i] = '\0';  
+                        state = -8; 
+                        break;
+                        
+                    case ADDITION_CH :  
+                        state = 9; 
+                        break;
+                        
+                    case HYPHENMINUS_CH :  
+                        state = 10; 
+                        break;
+                        
+                    case STAR_CH :  
+                        state = 11; 
+                        break;
+                        
+                    case SLASH_CH :  
+                        state = 12; 
+                        break;
+                        
+                    case GT_CH :  
+                        state = 13; 
+                        break;
+                        
+                    case LT_CH :  
+                        state = 14; 
+                        break;
+                        
+                    case EQ_CH :  
+                        state = 15; 
+                        break;
+                        
+                    case PERCENTAGE_CH :  
+                        state = 16; 
+                        break;
+                        
+                    case COMMA_CH : 
+                        term[i] = '\0'; 
+                        state = -17; 
+                        break;
+                        
+                    case SEMICOLON_CH : 
+                        term[i] = '\0'; 
+                        state = -18; 
+                        break;
+                        
+                    case COLON_CH : 
+                        term[i] = '\0'; 
+                        state = -20; 
+                        break;
+                        
+                    case TILDE_CH :  
+                        state = -19; 
+                        break;
+                        
+                    case EXCLAMATION_CH :  
+                        state = 21; 
+                        break;
+                        
+                    case NUMBERSIGN_CH :  
+                        state = 22; 
+                        break;
+                        
+                    case POINT_CH :  
+                        state = 23; 
+                        break;
+                        
+                    case QUOTATION_CH :  
+                        state = 24; 
+                        break;
+                        
+                    case QUESTION_CH : 
+                        state = -27; 
+                        break;
+                        
+                    default :           
+                        state =-8; 
+                        break;
+                }
+                break;
+                
+            case 1 :
+                if ( (DIGIT_CH != char_class[next_ch])
+                    && (LETTER_CH != char_class[next_ch]) ) {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';
+                    state = -1;
+                }
+                break;
+                
+            case 4:
+                if (AMPERSAND_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -LOGIC_TOKEN;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';      
+                    state = -LOGIC_TOKEN;
+                }
+                break;
+                
+            case 5:
+                if (PIPE_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -LOGIC_TOKEN;
+                } else if (EQ_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -ASSIGMENT_TOKEN;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';      
+                    state = -LOGIC_TOKEN;
+                }
+                break;
+                
+            case 6:
+                if (EQ_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -ASSIGMENT_TOKEN;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';      
+                    state = -LOGIC_TOKEN;
+                }
+                break;
+                
+            case 9:
+                if (ADDITION_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -9;
+                } else if (EQ_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -13;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';      
+                    state = -9;
+                }
+                break;  
+                
+            case 10:
+                if (HYPHENMINUS_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -9;
+                } else if (EQ_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -ASIGNATION_TOKEN;
+                } else if (GT_CH == char_class[next_ch]) {
+                    term[i] = '\0';
+                    state = -POINTER_TOKEN;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';      
+                    state = -9;
+                }
+                break;
+                
+            case 11:
+                term[i] = '\0';
+                state = 29;
+                break;
+                
+            case 12:
+                if (STAR_CH == char_class[next_ch] ) {
+                    while (1) {
+                        if ( '*' == (next_ch = getc(stream)) && '/' == (next_ch =getc(stream))  ){
+                            term[i++] = convert_case['*'];
+                            term[i++] = convert_case['/'];
+                            break;
+                        }
+                        term[i++] = convert_case[next_ch];
+                        term[i] = '\0';
+                    }
+                    term[i] = '\0';
+                    state = -COMENT_TOKEN;
+                } else if (SLASH_CH == char_class[next_ch] ) {
+                    while (1) {
+                        if ( '\n' == (next_ch = getc(stream)) ){
+                            break;
+                        }
+                        term[i++] = convert_case[next_ch];
+                    }
+                    term[i] = '\0';
+                    state = -COMENT_TOKEN;
+                } else if (EQ_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -13;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';      
+                    state = -12;
+                }
+                break;
+                
+            case 13:
+                if (GT_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = 100;
+                } else if (EQ_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -EQ_TESTING_TOKEN;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';      
+                    state = -LOGIC_TOKEN;
+                }
+                break;
+                
+            case 14:
+                if (LT_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = 100;
+                } else if (EQ_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -EQ_TESTING_TOKEN;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';      
+                    state = -LOGIC_TOKEN;
+                }
+                break;
+                
+            case 15:
+                if (EQ_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -LOGIC_TOKEN;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';      
+                    state = -ASSIGMENT_TOKEN;
+                }
+                break;
+                
+                // BITWISE
+            case 100:
+                if (EQ_CH == char_class[next_ch] ) {
+                    ungetc( next_ch, stream );
+                    term[i] = '\0';      
+                    state = -BITWISE_LOGIC_TOKEN;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';      
+                    state = -BITWISE_SHIFT_TOKEN;
+                }
+                break;
+                
+            case 16:
+                if (EQ_CH == char_class[next_ch] ) {
+                    term[i] = '\0';
+                    state = -ASSIGMENT_TOKEN;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';
+                    state = -ARITMETIC_TOKEN;
+                }
+                break;
+                
+            case 21:
+                if (EQ_CH == char_class[next_ch] ) {    
+                    term[i] = '\0';
+                    state = -LOGIC_TOKEN;
+                } else {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';
+                    state = -ASSIGMENT_TOKEN;
+                }
+                break;
+                
+            case 23:
+                if ( (DIGIT_CH != char_class[next_ch]) ){
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';
+                    state = 26;
+                }
+                if( (POINT_CH == char_class[next_ch])){
+                    state = 25;
+                }
+                break;
+                
+            case 24:
+                while (QUOTATION_CH != char_class[(next_ch = getc(stream))]) {
+                    term[i++] = convert_case[next_ch];
+                }
+                term[i++] = convert_case[next_ch];
+                state = -STRING_TOKEN;
+                term[i] = '\0';
+                break;
+                
+            case 25:       
+                if ( (DIGIT_CH != char_class[next_ch]) && ((POINT_CH != char_class[next_ch]))) {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';
+                    state = -25;
+                }
+                
+                
+                if ((POINT_CH == char_class[next_ch])) {
+                    state = 26;
+                }
+                break;
+                
+            case 26:
+                if ( (DIGIT_CH != char_class[next_ch]) ) {
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';
+                    state = -26;
+                }
+                break;
+                
+            case 29:
+                if ( (DIGIT_CH != char_class[next_ch]) && (LETTER_CH != char_class[next_ch]) ) {
+                    
+                    ungetc( next_ch, stream );
+                    term[i-1] = '\0';
+                    state = -COMENT_TOKEN;
+                }
+                break;
+                
+            default : state = -8; break;
+        }
+    }
+    
+    return( (TokenT) (-state) );
+} 
+
+
+#endif
diff --git a/FSm/main.c b/FSm/main.c
index 1e18eaa..3bd271d 100644
--- a/FSm/main.c
+++ b/FSm/main.c
@@ -1,518 +1,4 @@
-#include "header.h"
-
-/*
-  
- 
- 0    |   0      1     -2  -3  -4  -5  -6  -7    -8     -8
- 
- 1    |  -1      1     -1  -1  -1  -1  -1  -1     1     -1
- 
- **/
-
-
-static TokenT
-
-LeerToken( stream, term )
-
-FILE *stream;  
-
-char *term;
-
-{
-    
-    int next_ch;  
-    
-    int state;    
-    
-    int i;        
-    
-    int p;
-    
-    state = 0;
-    
-    i = 0;
-    
-    p = 0;
-    
-    while ( 0  <= state )
-        
-    {
-        
-        if ( EOF == (next_ch = getc(stream)) ) next_ch = '\0';
-        
-        
-        term[i++] = convert_case[next_ch];
-        
-        switch( state )
-        
-        {
-                
-            case 0 :
-            
-                
-                switch( char_class[next_ch] )
-                
-            {
-                    
-                case WHITE_CH :     i = 0; break;
-                case LETTER_CH :    state =  1; break;
-                                        
-                case LFT_PAREN_CH :
-                case RGT_PAREN_CH :
-                case LFT_CURLYBRACKET_CH :
-                case RGT_CURLYBRACKET_CH : 
-                case LFT_SQRBRACKET_CH : 
-                case RGT_SQRBRACKET_CH : term[i] = '\0'; state = -AGRUPATION_TOKEN; break;
-                    
-                case AMPERSAND_CH : state = 4; break;
-                                        
-                case PIPE_CH :       state = 5; break;
-                    
-                case CARET_CH :     state = 6; break;
-                    
-                case EOS_CH :       state = -7; break;
-                    
-                case DIGIT_CH :     state = 25; break;
-                    
-                case OTHER_CH :   term[i] = '\0';   state = -8; break;
-                    
-                case ADDITION_CH :  state = 9; break;
-                    
-                case HYPHENMINUS_CH :  state = 10; break;
-
-                case STAR_CH :  state = 11; break;
-                    
-                case SLASH_CH :  state = 12; break;
-                    
-                case GT_CH :  state = 13; break;
-
-                case LT_CH :  state = 14; break;
-
-                case EQ_CH :  state = 15; break;
-
-                case PERCENTAGE_CH :  state = 16; break;
-                    
-                case COMMA_CH : term[i] = '\0'; state = -17; break;
-
-                case SEMICOLON_CH : term[i] = '\0'; state = -18; break;
-                
-                case COLON_CH : term[i] = '\0'; state = -20; break;
-                    
-                case TILDE_CH :  state = -19; break;
-
-                case EXCLAMATION_CH :  state = 21; break;
-                    
-                case NUMBERSIGN_CH :  state = 22; break;
-                    
-                case POINT_CH :  state = 23; break;
-
-                case QUOTATION_CH :  state = 24; break;
-                    
-                case QUESTION_CH : state = -27; break;
-                    
-                    
-
-
-                default :           state =-8; break;
-                    
-            }
-                
-                break;
-                
-                
-            case 1 :                
-                
-                if ( (DIGIT_CH != char_class[next_ch])
-                    
-                    && (LETTER_CH != char_class[next_ch]) )
-                    
-                {
-                    
-                    ungetc( next_ch, stream );
-                    
-                    term[i-1] = '\0';
-                    state = -1;
-                }
-                
-                
-                break;
-            case 4:
-                
-                if (AMPERSAND_CH == char_class[next_ch] ) {
-                    term[i] = '\0';
-                    state = -LOGIC_TOKEN;
-                }else{
-                    ungetc( next_ch, stream );
-                    term[i-1] = '\0';      
-                    state = -LOGIC_TOKEN;
-                }
-            
-            break;
-            case 5:
-                
-                if (PIPE_CH == char_class[next_ch] ) {
-                    term[i] = '\0';
-                    state = -LOGIC_TOKEN;
-                }else
-                if (EQ_CH == char_class[next_ch] ) {
-                    term[i] = '\0';
-                    state = -ASSIGMENT_TOKEN;
-                }
-                
-                else{
-                    ungetc( next_ch, stream );
-                    term[i-1] = '\0';      
-                    state = -LOGIC_TOKEN;
-                }
-                
-                break;
-            case 6:
-                
-                if (EQ_CH == char_class[next_ch] ) {
-                    term[i] = '\0';
-                    state = -ASSIGMENT_TOKEN;
-                }else{
-                    ungetc( next_ch, stream );
-                    term[i-1] = '\0';      
-                    state = -LOGIC_TOKEN;
-                }
-                
-            break;
-                
-            case 9:
-                
-                if (ADDITION_CH == char_class[next_ch] ) {
-                    
-                    term[i] = '\0';
-                    state = -9;
-                }else
-
-                        
-                if (EQ_CH == char_class[next_ch] ) {
-                            
-                    term[i] = '\0';
-                    state = -13;
-                }else
-                {
-                    ungetc( next_ch, stream );
-                    term[i-1] = '\0';      
-                    state = -9;
-                }
-            
-            break;  
-                
-            case 10:
-
-                if (HYPHENMINUS_CH == char_class[next_ch] ) {
-                    
-                    term[i] = '\0';
-                    state = -9;
-                }else
-                    
-                    
-                if (EQ_CH == char_class[next_ch] ) {
-                        
-                        term[i] = '\0';
-                        state = -ASIGNATION_TOKEN;
-                }else
-                if (GT_CH == char_class[next_ch]) {
-                    term[i] = '\0';
-                    state = -POINTER_TOKEN;
-                    
-                }else{
-                        ungetc( next_ch, stream );
-                        term[i-1] = '\0';      
-                        state = -9;
-                }
-                
-                break;
-                
-            case 11:
-                    
-                    term[i] = '\0';
-                    state = 29;
-                
-                
-            break;
-                
-            case 12:
-                
-               
-                if (STAR_CH == char_class[next_ch] ) {
-                    
-                    
-                    
-                    while (1) {
-                        if ( '*' == (next_ch = getc(stream)) && '/' == (next_ch =getc(stream))  ){
-                            term[i++] = convert_case['*'];
-                            term[i++] = convert_case['/'];
-                            break;
-                        }
-                        term[i++] = convert_case[next_ch];
-                        term[i] = '\0';
-                    }
-                    
-                    term[i] = '\0';
-                    state = -COMENT_TOKEN;
-                    
-                }else
-                
-                if (SLASH_CH == char_class[next_ch] ) {
-                    
-                    while (1) {
-                        if ( '\n' == (next_ch = getc(stream)) ){
-                            break;
-                        }
-                        term[i++] = convert_case[next_ch];
-                    }
-                    
-                    term[i] = '\0';
-                    state = -COMENT_TOKEN;
-                }else
-                
-                if (EQ_CH == char_class[next_ch] ) {
-                    
-                    term[i] = '\0';
-                    state = -13;
-                }else
-                {
-                    ungetc( next_ch, stream );
-                    term[i-1] = '\0';      
-                    state = -12;
-                }
-                
-                
-                
-
-
-                
-            break;
-           
-            case 13:
-                
-                if (GT_CH == char_class[next_ch] ) {
-                        
-                        term[i] = '\0';
-                        state = 100;
-                }else
-                        
-                if (EQ_CH == char_class[next_ch] ) {
-                            
-                            term[i] = '\0';
-                            state = -EQ_TESTING_TOKEN;
-                }else
-                {
-                            ungetc( next_ch, stream );
-                            term[i-1] = '\0';      
-                            state = -LOGIC_TOKEN;
-                }
-                
-            break;
-            case 14:
-                
-                if (LT_CH == char_class[next_ch] ) {
-                    
-                    term[i] = '\0';
-                    state = 100;
-                }else
-                    
-                    if (EQ_CH == char_class[next_ch] ) {
-                        
-                        term[i] = '\0';
-                        state = -EQ_TESTING_TOKEN;
-                }else
-                {
-                        ungetc( next_ch, stream );
-                        term[i-1] = '\0';      
-                        state = -LOGIC_TOKEN;
-                }
-                
-            break;
-                
-            case 15:
-                
-                if (EQ_CH == char_class[next_ch] ) {
-                    
-                    term[i] = '\0';
-                    state = -LOGIC_TOKEN;
-                }else
-                {
-                        ungetc( next_ch, stream );
-                        term[i-1] = '\0';      
-                        state = -ASSIGMENT_TOKEN;
-                }
-                
-            break;
-                
-            // >>
-            case 100:
-                if (EQ_CH == char_class[next_ch] ) {
-                    ungetc( next_ch, stream );
-                    term[i] = '\0';      
-                    state = -BITWISE_LOGIC_TOKEN;
-
-                }else{
-                    ungetc( next_ch, stream );
-                    term[i-1] = '\0';      
-                    state = -BITWISE_SHIFT_TOKEN;
-                }
-            
-            break;
-                
-            case 16:
-                
-                if (EQ_CH == char_class[next_ch] ) {
-                    
-                    term[i] = '\0';
-                    state = -ASSIGMENT_TOKEN;
-                }else
-                {
-                    ungetc( next_ch, stream );
-                    term[i-1] = '\0';
-                    state = -ARITMETIC_TOKEN;
-                }
-            
-            break;
-                
-            case 21:
-                
-                if (EQ_CH == char_class[next_ch] ) {
-                    
-                    term[i] = '\0';
-                    state = -LOGIC_TOKEN;
-                }else
-                {
-                    ungetc( next_ch, stream );
-                    term[i-1] = '\0';
-                    state = -ASSIGMENT_TOKEN;
-                }
-                
-            
-            break;
-                
-                
-                
-                
-            case 23:
-                if ( (DIGIT_CH != char_class[next_ch]) ){
-                    
-                    ungetc( next_ch, stream );
-
-                    term[i-1] = '\0';
-                    state = 26;
-                }
-                
-                if( (POINT_CH == char_class[next_ch])){
-
-                    state = 25;
-                }
-            break;
-                
-            case 24:
-                
-                
-                while (QUOTATION_CH != char_class[(next_ch = getc(stream))]) {
-                    term[i++] = convert_case[next_ch];
-                    
-                }
-                term[i++] = convert_case[next_ch];
-                state = -STRING_TOKEN;
-                
-                term[i] = '\0';
-
-                
-            break;
-                
-                
-            case 25:       
-                
-                
-                if ( (DIGIT_CH != char_class[next_ch]) && ((POINT_CH != char_class[next_ch])))
-                    
-                {
-                    ungetc( next_ch, stream );
-                    
-                    term[i-1] = '\0';
-                    
-                    state = -25;
-                    
-                    
-                    
-                }
-                
-                
-                if ((POINT_CH == char_class[next_ch])) {
-                    
-                    state = 26;
-                }
-                
-                
-                
-            break;
-                
-            case 26:
-                
-                
-                
-                if ( (DIGIT_CH != char_class[next_ch]) )
-                    
-                {
-                    
-                    
-                    ungetc( next_ch, stream );
-                    
-                    term[i-1] = '\0';
-                    
-                    state = -26;
-                    
-                }
-                
-                
-                
-                
-            break;
-                
-            case 29:
-                
-                
-                if ( (DIGIT_CH != char_class[next_ch]) && (LETTER_CH != char_class[next_ch]) )
-                    
-                {
-                    
-                    
-                    ungetc( next_ch, stream );
-                    
-                    term[i-1] = '\0';
-                    
-                    state = -COMENT_TOKEN;
-                    
-                }
-                
-                
-                
-                
-                break;
-
-    
-                
-           
-                
-            default : state = -8; break;
-            
-                
-                
-        }
-        
-    }
-    
-    
-    
-    return( (TokenT) (-state) );
-    
-    
-} 
-
-
+#include "Token.h"
 
 int main(int argc, char **argv, char **envp){