fix bug https://trello.com/c/0kYplDB0
shorter file names
remove unused files