Fixed folder strucure again