Changed the structure.

Fixed Bugs, Added new Parameters, Changed the Structure.