Changed folder names, typo with statics