Fixed stuff, moved files, made code clearer