Fixed text output and changed file structure