Preliminary folder implementation
folder implementation polish
rework layout to fit more naturally