removed core package and refactored template files to be more optimized