added modularization to features folder