Remove binaries and restructure directory tree