Remove core directory and some changes