cleaned up file structre and adding padding on boxes