* Re-implement incremental schematic names in a folder - Fixes #1545 * Move fawe end comment * Slight cleanup