Code refactoring
Updated category list with new one
Added U2020 like versioning into gradle