Removed dependency notices
Fixed link
More reshuffling of files and fixes