Improved interface and removed unnecessary files