Issue/11

fixes #11 
I believe they can.  How do you propose I organize these files?