v3.0b

Fixed some name conventions.
Did some cleaning.
Rearanged some code.