Re-structured folder hierarchy.