Move files to subfolder and forgotten files added

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>