Moved everything to single folder for now. A couple fixes as well.