Stuart Sierra's component added
Reorganization of src structure.