Added wafer mapping for some functions, cleaned up file structure.