Package refactoring and fixed project build path