Fix folder structure
Add more features... not much....