Improved files and folder setup