Minor modifications after file restructuring