Changing puppet file structure,.htaccess issue solv, adding new features