reorganized/renamed files and classes