Fix #115 , improve behavior management and remove unwanted files