Removed unwanted stuff in ace library and relocated it