renamed folders and merged
Merge pull request #1 from Jaxkr/master

oh boy. Just cleaning up.