SWAG

Refactored the complete analyse code base.
Read the comments...