added methods and moved files