Improved folder scructure