reorganization of files

fixes #55