Major directory and file names rework
Merge pull request #34 from Kenny9999/master

Major directory and file names rework