File restructure and little housekeeping