refactoring : restructured files
refactoring : removed templates