fix #1. Clean up. Removed unnecessary files.
fix #1. Some more clean ups.
fix #2.
fix #4