Changed file structure, added fire lib