Bug Fix
Reorginized project