Fixed errors, changed folder structure