fixed so it now works with express
moving some files around