Finally moved to included makefile rules