Merge pull request #34 from Kenny9999/master

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

some other work!
Little fix
Merge pull request #36 from LithiumNL/master

Little fix
Fix uppercase naming!