init: file re-structurization
Merge pull request #1 from tttor/init

init: file re-structurization