Project structure refactored: packages added to group files