core update

moved code to other files