Getting rid of confusing component folders