Removed empty folders and cleand up warnings