minor fixes and moved in folder