fixed helper files & requires