code style updated & new folder structure