Cleaner folder structure, trying to understand FH buffer as well