New heirarchy and some temporary files