Restructured some names
Seperated api string in seperate strings file
Merge branch 'feature/restructure' into develop