better structure
Merge pull request #7 from masarakki/rename

better structure