Version 4

*initial reorganizing
*initial restyling