* Move annotations to do with injection to a seperate module for improved modularity * Remove redundant config in build script, add (c)