moved all static content into single folder
merged