fixes #1, renamed some files