re-organized the folder structure
updated log4j version