Worked on #14. Reorganized repo structure from older code to new.