switch to better folder layout