Some folder structure rearrangent