fixed some missing methods and renamed files