Improved folder layout