Changed project's file structure
Added "static" keyword to constants