Move the source files to src folder
Fix roll up/down output