Update services
File renaming for modular structure
More moving/renaming for modular structure
Basics for new design