Added libraries & modified directory structure