Implement StaticFactory Pattern
Rename files