updated folders, added infrastructure