Several changes in kernel and folder structure