Updated with latest design.
Decided against renaming the files, even though the naming is stupid.