Reverted folder hierarchy