Improve template
Remove src folders