Clean project

Remove distribute, remove code duplication