Reorganize solution with new way of organization