spring cleaning in project structure
fmt