adding more project organization; changed methods and param names;