refactor code and comment variables
refactor and atomic function
Final repairs in code (packages control and util)
Merge branch 'AP5'