changed folder locations

better organization