Added common & resources folders