refactoring, moving, wip on Layer_Theme and removed mismoved CFS interface