fixed file structure, moved deprecated code