Moving the coffee directory outside of the static directory and correct some bugs due to the conflicts…