reorg files, folders and names to make it more logical
change all directives from elements to attributes
Merge branch 'dev'