remove hardcoded value
add subdirectory
add some padding