Added vendors folder + some experimental changes