Changing static directory and some cleanup