move templates to appropriate folder, use more static requests