Remove old functionality
Created new structure