mdkrasnow
Refactor structure
fc14c37