Closes #17. Fixed many organization issues and everything seems to work now.