Cleaner include/exclude for the core module

Change-Id: I42963f1f92735e51a040d956d84bb85f86d1deeb
Signed-off-by: John May <john.wilkinsonmay@gmail.com>
Added a few missing names

Change-Id: Id88dc77b0f0e3566407bd9b6e722a6fb669b1523
Added the names to the pom.xml too

Change-Id: I4f15bc525196913fd0ef84085204bfd519e30860