Separating out configuration from inmplementation
Remove old files