little old changes, structure now the same as in main branch. This branch will be merged with clear-white