major redesign. Recommitted all files. Changed directory structure.