Added custom buttons from elvap's request

moved some folder arround as well to make it more organized