modified folder structure a little.