Adjusted the structure into clearly defined pre and post files.