Stripping out stuff and reorganizing for mah needz