Did some minor fixings and changed file names.
m
Merge pull request #3 from IndiumGames/test-fixing

Test fixing