final refactoring
removed old amazon folder
bugs fixed