cleanup
adjust to new package locations, add fbpparse