Moving things around.
Merge pull request #12 from kcarcia/organizing

Moving things around.