Fixed text output
Reorganized headers and source files
Merge pull request #1 from terrehbyte/master

Fixed text output and changed file structure