Re-structure features folder