Solved #12

And did some code cleanup
refactored the file naming scheme