Did some assets surgury and cleaned up the RDK

last push for tonight