Tweak folder structure
CS fixes