Modified the src directory to remove boilerplate code