added correct(?) flux implementation, removed old files