File Structure + Service Patterns instead of commander pattern