Dead source folders removed
Initial implementation of a static injection framework
Small refactoring + useless things commented out
Merge branch 'master'