More design changes

I need to finish more design changes before implementing some of the
planed features for version 0.2.1
PLEASE REPLY if there are any issues with these changes