Merged changes + removed sourcedirectory altogether