refactoring in project

Change-Id: I49ba3501f4ecd19cafdfeb514bda1d90cff90bbd